Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release/25.5 into trunk #23898

Closed
wants to merge 17 commits into from
Closed

Merge release/25.5 into trunk #23898

wants to merge 17 commits into from

Conversation

wpmobilebot
Copy link
Contributor

Merging release/25.5 into trunk.

Via intermediate branch merge/release-25.5-into-trunk, to help fix conflicts if any:

                            release/25.5  ----o-- - - -
                                               \
           merge/release-25.5-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

wpmobilebot and others added 17 commits December 5, 2024 04:06
@wpmobilebot
Bump version number
b3dac89
@wpmobilebot
Update draft release notes for 25.5.
1297016
@wpmobilebot
Update draft release notes for 25.5.
dd08f31
@wpmobilebot
Release Notes: add new section for next version (25.6)
145b419
@oguzkocer
Remove Jetpack-only entries from WordPress 25.5 raw release notes
c7d572c
@wpmobilebot
Update strings for localization
37452ba
@oguzkocer
Add beta app description to Testflight builds
cedd798
@oguzkocer
Remove trailing commas from beta_app_description_path
3a1efc7
@oguzkocer
Manually bump version number
262b961
@wpmobilebot @oguzkocer
Merge release_notes/25.5 into release/25.5 (#23874)
c35ff67 
* Add editorialized release notes for version

* Update metadata strings

* Update metadata strings

---------

Co-authored-by: Oguz Kocer <[email protected]>
@kean
Fix layout of cross-post cells
e010fe9
@kean
Reader: Fix layout for cross-post cells on iPad (#23880)
f2bac5b
@oguzkocer
Replace VERSION_FILE with PUBLIC_VERSION_FILE in current_version_hotfix?
cb47919
@wpmobilebot
Update app translations – Localizable.strings
997dc6b
@wpmobilebot
Update WordPress metadata translations
5a757ff
@wpmobilebot
Update Jetpack metadata translations
55b4408
@wpmobilebot
Bump version number
fb0a65a
@wpmobilebot wpmobilebot added this to the 25.6 milestone Dec 16, 2024
@dangermattic
Copy link
Collaborator

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@wpmobilebot wpmobilebot modified the milestones: 25.6, 25.7 Dec 16, 2024
@wpmobilebot
Copy link
Contributor Author

Version 25.6 has now entered code-freeze, so the milestone of this PR has been updated to 25.7.

@wpmobilebot
Copy link
Contributor Author

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr23898-fb0a65a
Version25.5
Bundle IDorg.wordpress.alpha
Commitfb0a65a
App Center BuildWPiOS - One-Offs #11185
 Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor Author

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr23898-fb0a65a
Version25.5
Bundle IDcom.jetpack.alpha
Commitfb0a65a
App Center Buildjetpack-installable-builds #10223
 Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@oguzkocer
Copy link
Contributor

I am not sure what caused this PR to be opened. 25.5 release is already wrapped up and I was working on the 25.6 code freeze.

All these changes have been previously merged in #23892.

@oguzkocer oguzkocer closed this Dec 16, 2024
@oguzkocer oguzkocer deleted the merge/release-25.5-into-trunk branch December 16, 2024 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Releases
Projects
None yet
Milestone
25.7
Development

Successfully merging this pull request may close these issues.
4 participants
@wpmobilebot @dangermattic @oguzkocer @kean